Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 5 Jul 2010 11:22:19 +0000 (11:22 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 5 Jul 2010 11:22:19 +0000 (11:22 +0000)
commitb3ae0496e8a04545f8e6f873dcb8196541c53769
tree187213a325b741eb1ab1db23a28f107d2bb2ace9
parent16106cdc20f5ab0df22841e88bf9d6575bc8c6f7
parent1736ba0fddf0b4f67cce3b8e42996946e2d6617f
Merge from mainline.